check GTK_MENU_ITEM (menu_item)->accel_path first when looking up the

2001-12-12  James Henstridge  <james@daa.com.au>

	* gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM
	(menu_item)->accel_path first when looking up the accel path.

diff --git a/ChangeLog b/ChangeLog
index c353dd1ba2788095e0a9cd3be6db1a5a217a2237..6232eafcafa8bc01f015492ce19318f4e211f249 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-12  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM
+       (menu_item)->accel_path first when looking up the accel path.
+
 Tue Dec 11 19:18:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testgtk.c (layout_expose_handler): Only draw

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c353dd1ba2788095e0a9cd3be6db1a5a217a2237..6232eafcafa8bc01f015492ce19318f4e211f249 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-12-12  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM
+       (menu_item)->accel_path first when looking up the accel path.
+
 Tue Dec 11 19:18:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testgtk.c (layout_expose_handler): Only draw

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c353dd1ba2788095e0a9cd3be6db1a5a217a2237..6232eafcafa8bc01f015492ce19318f4e211f249 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-12-12  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM
+       (menu_item)->accel_path first when looking up the accel path.
+
 Tue Dec 11 19:18:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testgtk.c (layout_expose_handler): Only draw

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c353dd1ba2788095e0a9cd3be6db1a5a217a2237..6232eafcafa8bc01f015492ce19318f4e211f249 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-12-12  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM
+       (menu_item)->accel_path first when looking up the accel path.
+
 Tue Dec 11 19:18:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testgtk.c (layout_expose_handler): Only draw

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c353dd1ba2788095e0a9cd3be6db1a5a217a2237..6232eafcafa8bc01f015492ce19318f4e211f249 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-12-12  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM
+       (menu_item)->accel_path first when looking up the accel path.
+
 Tue Dec 11 19:18:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testgtk.c (layout_expose_handler): Only draw

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c353dd1ba2788095e0a9cd3be6db1a5a217a2237..6232eafcafa8bc01f015492ce19318f4e211f249 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-12-12  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM
+       (menu_item)->accel_path first when looking up the accel path.
+
 Tue Dec 11 19:18:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testgtk.c (layout_expose_handler): Only draw

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c353dd1ba2788095e0a9cd3be6db1a5a217a2237..6232eafcafa8bc01f015492ce19318f4e211f249 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-12-12  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkmenu.c (gtk_menu_key_press): check GTK_MENU_ITEM
+       (menu_item)->accel_path first when looking up the accel path.
+
 Tue Dec 11 19:18:21 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/testgtk.c (layout_expose_handler): Only draw

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 940433f4b5cd33fdd78e998cfa2e435e95c2cc46..e3940b511a1c2be5e6a021c66faf23b6a5256245 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1659,7 +1659,9 @@ gtk_menu_key_press (GtkWidget     *widget,
       gboolean replace_accels = TRUE;
       const gchar *path;
 
-      path = _gtk_widget_get_accel_path (menu_item);
+      path = GTK_MENU_ITEM (menu_item)->accel_path;
+      if (!path)
+       path = _gtk_widget_get_accel_path (menu_item);
       if (!path)
        {
          /* can't change accelerators on menu_items without paths